RESTRICT AUTOMERGE am: e5069813ec am: b936aa12e7

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

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