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

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



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