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

Change-Id: I28a196fb02d1945c6d793308296a2c20f8cefbba