Android 9.0.0 release 58
Snap for 4484469 from c72813be6adb07861da8f6344efd7092b997f54a to pi-release

Change-Id: Ie73893047aeedf3ce9e4ff9869318598586a9c81