Update Felix SVN to 18 am: b3193d2db4 am: d084976efc

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

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