Merge "Stop managed profile owner granting READ_SMS" into qt-dev am:...

Merge "Stop managed profile owner granting READ_SMS" into qt-dev am: 62044e50 am: 676cefb0 am: 539fea38 am: e13c6379 am: e456e2f6 am: 06aa91e2 am: 33a8d8ea am: 8bb49e18 am: f7db111d

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



Change-Id: If7f18c3f83d3f84b3c6d86134b43622c99cd7f49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>