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" into tm-d1-dev-plus-aosp am: 9619b247

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



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