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

Bug: 130175407
Change-Id: I2024305fe2afbe3f8b20f202d14dccad542b916d