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

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



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