Merge "Step 1 of Removing Ids from Flags." into tm-qpr-dev am: b21f162d

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



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