tree 489882a2b8d9c6c04385d9a89e1d443fff21a6a4
parent 29e10c35c0240b38997c87e8fcbe5187adeb5d1a
parent 67c4aab66460ee4a208633b8fe6ee7ef6f36df4a
author Michele Berionne <mberionne@google.com> 1547858351 -0800
committer android-build-merger <android-build-merger@google.com> 1547858351 -0800

Merge "Carrier restriction enhancements for Android Q"
am: 67c4aab664

Change-Id: I03ef38321833c23427b7c638c30faae54be0b7ea