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

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



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