[automerger skipped] Merge "Look up CBS package name through PackageManager." am: e24a23f9ab am: f42a022a8f -s ours am: e60cb2f67b -s ours am: 339c352ac3 -s ours
am skip reason: Change-Id I0feb356e6cd4868f71198bdee49a7658b4b98b5d with SHA-1 b6139c0caf is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1391157
Change-Id: Iaef18fc04be9b7d94cb84655dca15d9479778f1d
This commit is contained in: