Update SVN to 21 for O6R4 Feb MPR 2022

Bug: 208388283
Change-Id: Ibed22f512bb16e2166b81a783a707d0018aa88a3
(cherry picked from commit 0d1967598533d77996ff363d9eeea35914f72410)
Merged-In:Ibed22f512bb16e2166b81a783a707d0018aa88a3
2 files changed