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

Change-Id: I5d7e606bd00bc73b021b4bb81545223a754191ae