Merge changes from topic "btaa" am: 5d876b6024

Original change: https://android-review.googlesource.com/c/platform/system/sepolicy/+/1463604

Change-Id: I3b103e503353d5e21a2d6e558693101f8561dbec