Merge commit '7bef3f3e543161c8359c37a07035c7d517bd1819' into manual_merge_7bef3f3e543161c8359c37a07035c7d517bd1819 am: 9a16742f44

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

Change-Id: I8b52fc8c814864a92dbfea57c48059006cce7390