Revert "Revert "Update felix SVN to  21""

This reverts commit b6fc908043b39da2ab21fe95ff9b4899dc323449.

Reason for revert: Need the SVN for F10 KDDI build

Bug: 289414927
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:5ee36bd203f098b21b90e43ae9967a93f493ddb9)
Merged-In: I09e8877ac2325a0056c931ce01602fffb7e68c35
Change-Id: I09e8877ac2325a0056c931ce01602fffb7e68c35
1 file changed