Merge "Return TotalMemory size when ddr size is not present" am: 24e934c0...

Merge "Return TotalMemory size when ddr size is not present" am: 24e934c0 am: c1029121 am: ff3b9469 am: 1ece5c0e am: c8b0e63a am: 12887606

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2583778



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