Android Q Preview 2.5 (QPP2.190228.023)
DO NOT MERGE -- Merge PPRL.190405.003 into master

This restores commit 987a4730999022ab67d7cd6431d02a97748a4406
by reverting 4cde522c6ceef5239779a7570308461828d40296.

Bug: 130175407
Change-Id: Ifa874009b4eb29e61351df110fe75077a7a0250d
186 files changed