[automerger skipped] Update felix SVN to 38 am: 31ce8317f1 am: 0b0b1f9752 -s ours

am skip reason: Merged-In I27e8700b3e44f927aee6830cd5206280694ed5d8 with SHA-1 df80f43c0f is already in history

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

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