Merge "Look up CBS package name through PackageManager." into rvc-dev am:...
Merge "Look up CBS package name through PackageManager." into rvc-dev am: b8624208 am: f9a7904f am: d98b3a0c am: 05ca4e2e
Change-Id: I1fada4cda563651909b10be6a395a07d7652601a