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

Change-Id: I8a30abb5f804a856b39c2729b6968d3d98f05f26