Merge "Do not launch legacy notification dialog if permission is granted" into tm-dev am: c5026d42 am: 4e881aec

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

Change-Id: Ia7cd7339611397f1fce05e5dd7f0e4f6bb50eaee