Merge "Update felix SVN to 30" into udc-qpr-dev am: 191a8f3462 am: e3dc31a837

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

Change-Id: I2fcb6f1af1f25afdf69e0fc5e7e15149d384d220
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>