Merge "smoreland LAST_RESORT_OWNERS" am: 5bdc4b86fa

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

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