Merge "Use setIdentifier instead of dynamic categories" into tm-qpr-dev am: 861541ab83

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

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