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

Change-Id: I482091c4a62db1f16083933b45cf4aacc83b05d7