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

Bug: 130175407
Change-Id: I3911f893b3c71d61373fe412465c1ac71cb628da