Merge "Remove leak detection options" am: 0c590d71

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



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