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

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

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