Merge "Replace copy-on-write PDB with an empty one" am: 8aa6183e57 am: 180fdaa1d5

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1640147

Change-Id: Icd9fe7724156fdac42f98ba5b10e9183b89334e9