DO NOT MERGE - Merge PPRL.190405.003 into stage-aosp-master

Bug: 130175407
Change-Id: Ic724f91a019ee4e81e0f921eda72229730ca8d4c