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

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

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