Android 9.0.0 Release 47 (PQ3B.190801.002)
Merge remote-tracking branch 'toybox/master' into HEAD am: 14cafec540 am: 4d29f725c0
am: 7f401dbdde

Change-Id: I7ba3d69a58986c71eaf798e7404c634c51a7352c