Merge "Reuse merged token and add additional checks." into udc-dev am: ea6b64e6 am: 789f2424

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



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