Merge "Remove leak detection options" am: 0c590d71 am: 39605d93 am:...

Merge "Remove leak detection options" am: 0c590d71 am: 39605d93 am: fcdf55c6 am: 5193dfc5 am: dedb4b8e

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



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