RESTRICT AUTOMERGE am: 6a58836fbd am: 511134ca69

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

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