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

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



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