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

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



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