Merge "Extend the timeout of update state" into tm-dev am: 6687030f am: e41d608c am: b82e422b

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



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