Merge "Revert "Remove leak detection options"" am: 7c853f50 am: 0313d5b5...

Merge "Revert "Remove leak detection options"" am: 7c853f50 am: 0313d5b5 am: aec28ea2 am: 0135b631

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



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