Merge changes from topic "disable_leaks" am: 00f3207f am: 191458b8 am:...

Merge changes from topic "disable_leaks" am: 00f3207f am: 191458b8 am: 3722e36b am: ac4a96a3 am: 6c21f4d3 am: 4eed2b1b

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



Change-Id: I1af4a833a28bad495af7ba55d42ddc17ec3f52da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>