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

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



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