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

Change-Id: Ie9cf562b4514f735edad3ecb1d39da1340f79972