Merge "RESTRICT AUTOMERGE" into rvc-qpr-dev am: 8815b57536

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

Change-Id: Id47628c0919bb451fdf68c2f041a352e44570a69