[automerger skipped] Merge "Look up CBS package name through PackageManager." am: e24a23f9ab
am: f42a022a8f
-s ours am: e60cb2f67b
-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: Ibf4937b0c5da38d7102def87014b475e01b6cc55
This commit is contained in: