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

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

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