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: 19589d5b am: 84c8dd38 am: df8a5c20

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



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