Merge "Add check for null token when updating state" into tm-dev am: 0e29401d65 am: be6ae60318 am: 291a87bc2c am: 2a04cc4022
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18634544 Change-Id: Iaf5b189f3e700188a2e1a3ac5d12fca0a622e757 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: