Merge "Merge "Make sure to always upgrade runtime permissions" into qt-dev am: 3fb12ba4 am: 8ea7627c" into qt-r1-dev-plus-aosp