Merge "Merge "Move ShutdownThread calls to system ui thread." into oc-dr1-dev am: 39a556f1 am: 9e7e827d" into oc-mr1-dev-plus-aosp