Merge changes from topic "cow_pdb" am: 811ad79636

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

Change-Id: I73780406caf9ebd6b7134e49c87d0686d406bb71