Android Q Preview 2.5 (QPP2.190228.023)
Merge "Move the xz-java Android.bp to its new home..."