Merge changes from topic "cow_pdb" am: 811ad79636 am: fb45477a51

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

Change-Id: I7050d72a6432e3dcc6d6565b1aa1671107246f4f