Merge "Merge "Add check for null token when updating state" into tm-dev am:...

Merge "Merge "Add check for null token when updating state" into tm-dev am: 0e29401d am: 9854e5d1 am: 1d1c0a90" into tm-qpr-dev-plus-aosp am: 440ba180

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



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