[automerger skipped] DO NOT MERGE - Merge PPRL.190405.003 into stage-aosp-master
am: 32f06593ed -s ours
am skip reason: subject contains skip directive

Change-Id: Ic7bde3602d31d3901d5fcf26d64b0419b5c6b30e