Merge "Memtrack: Fallback to HIDL implementation" am: 65fac116 am:...

Merge "Memtrack: Fallback to HIDL implementation" am: 65fac116 am: 4c6a07a5 am: 0c7c984a am: 4b20f921 am: e15e68ae

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



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