Adding content fixes from Android 9 errata.

Bug: 140142603

Test: N/A
Change-Id: I19f776dba6fe6a9a0a3d626311d8a836f2c2192c
2 files changed