Merge "[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190605.003) into master am: c0ff987d -s ours am: 93d358bb -s ours am: 08db015e" into qt-r1-dev-plus-aosp