Merge "Missing change on symbols.xml for token migration" into udc-dev am:...

Merge "Missing change on symbols.xml for token migration" into udc-dev am: aa820609 am: adb52e17

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



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