Merge Android 12 am: d715f253e3

Original change: https://android-review.googlesource.com/c/device/google/trout/+/1847355

Change-Id: I9c711cc73406d313103462b483e6a4ee34710bb7