Merge "Revert "Remove leak detection options"" am: 7c853f50

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



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