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

Change-Id: Ie384c5d29d3f7de2b6a977ca148d4f39bbd8c2fc