tree f6b97c81e7f8c08f64511adb136231bc7b07f562
parent 08a6c60cdb1f940cb9fde10e21e78901068b2750
parent 93c9d61865ce2c105982ae75f2f6ddae2fbc3141
author Svet Ganov <svetoslavganov@google.com> 1564290385 -0700
committer android-build-merger <android-build-merger@google.com> 1564290385 -0700

Merge "[DO NOT MERGE] Don't drop restricted permissions on upgrade am: 0b41c8940a am: 29adaea681" into qt-r1-dev-plus-aosp
am: 93c9d61865

Change-Id: I0687aadcd58f205669b9747666d5d64693a51ae1