Update felix SVN to 31 am: 55b74d41e9 am: 03e4dfdb9b

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

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