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

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

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



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