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 am: 3270dd64

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



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