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: d8216ec3 am: 1cce4ae7

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



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