Merge "Memtrack HAL: Remove MemtrackType::NUM_TYPES" am: 5a52686fd6 am: 15bf0b3294

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1587451

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic1308e52342a7a5d8a61e56b38dc1b99a1649aba