[automerger skipped] More pre/postsubmit tests to dumpstate am: dc6be807ac am: 765cbb36eb am: fc841d902b am: c45a4949d1 -s ours

am skip reason: Change-Id Ieca9e2a87f5005b6c10af2ceba0178b8c6d2b2ef with SHA-1 aa655cfb27 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1441339

Change-Id: Ie4d224cbcbeba0226811ee75612c39b0e30bd074