am 84adc43a: Merge "Fix issue #18706195: Improve label names of memory types" into lmp-mr1-dev automerge: 0f050ea
am 84adc43a: Merge "Fix issue #18706195: Improve label names of memory types" into lmp-mr1-dev
automerge: 0f050ea

* commit '0f050ea40204242387eac8f7f5949ea16c143515':
  Fix issue #18706195: Improve label names of memory types

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base