[automerger skipped] DO NOT MERGE - Merge pi-platform-release (PPRL.190505.001) into stage-aosp-master
am: 4676175e7a -s ours
am skip reason: subject contains skip directive

Change-Id: Iba1392cac1cf686d000d87c93f2bde8519ef1d89