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

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

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