Merge "Memtrack: Fallback to HIDL implementation" am: 65fac116d3 am: 4c6a07a53e am: 0c7c984a2b

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

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