Merge "Fix FSI not launching when locked" into udc-dev am: 18216d97 am: f206336f

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



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