Update felix SVN to 35 am: a2ba6a3626 am: a17750c933

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

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