Merge "Revert "Update felix SVN to  21"" into udc-dev am: 9e3aa97625

Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24288899

Change-Id: I7df76636e07b4f1c677f32e62e12c50a6f56e2dc
Signed-off-by: Automerger Merge Worker <[email protected]>