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

Bug: 130175407
Change-Id: I4de44930de1f067cc5db936e67ea6fe9314c8e18