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

Change-Id: I1318164b00addc83fdf82e9d9c5dd722cf9e09a3