Merge aosp/master into aosp/pie-gsi

Test: Local build and boot
BUG: 132757761
Change-Id: Ibd997385af62e568969b78722b132499acc3ebde
[adelva: this is actually a fast-forward]