[automerger skipped] Merge "DO NOT MERGE: Cherry-pick a bunch fixes to AOSP" am: 56cc4986df -s ours am: 0e05005d8d -s ours

am: e8bf02f256  -s ours

Change-Id: I4858f230255f0c19a5e7a4ac9ffd0c85841721f1
This commit is contained in:
Fan Zhang
2018-08-28 14:55:39 -07:00
committed by android-build-merger

Diff Content Not Available