Ensure policy notifications are shown

cherry-pick of:
https://googleplex-android-review.googlesource.com/218352
https://googleplex-android-review.googlesource.com/218353

Bug: 8510828
Change-Id: Ic788c40456e32fec5e7589c4ed2f40e399dd062d
2 files changed