Merge "smoreland LAST_RESORT_OWNERS" am: 5bdc4b86fa am: 84737873e1 am: 3f8d75d44f

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2321924

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