[automerger skipped] Merge "Carrier restriction enhancements for Android Q" am: 67c4aab664 am: a2d4f77e25
am: 860613be4d -s ours
am skip reason: change_id I9a73cf2383722818019155ed4b812f6b9d9e72f9 with SHA1 482f820d10 is in history

Change-Id: I833c136bba048cdd433359fcd8ccc7b8794ea2c0