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

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



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