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

Bug: 130175407
Change-Id: I847665002deb2bc4a8da0779e12ead2c773c6095