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

Change-Id: I18c83d52db1c1aa5e3f440e94349229b40344663