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

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



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