Merge "Remove leak detection options" am: 0c590d71bd am: 39605d93e4

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

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