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

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

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