[automerger skipped] Merge "Merge redfin/bramble support." am: bc82c10dd2 -s ours

am skip reason: Change-Id I34a9e434b0b481f7dd3ad9a86e2c89bc300ceae5 with SHA-1 4c7690ee01 is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/PackageInstaller/+/1465765

Change-Id: I86fba6f63f1c3ee05cbdd7c33679c38f42ff3e6b