Merge "RESTRICT AUTOMERGE Read flag resource overrides." into sc-v2-dev am: debbf88d54

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

Change-Id: Ia96030496055163b7ed2cf72bc890145d83957f4