Merge "Fix can't start injected item problem" into tm-dev am: 74c324b7 am: 0dc5eff1

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18570252



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