Merge "Fix a bug about AppProfiler / setMemFactorLocked." into udc-dev am:...

Merge "Fix a bug about AppProfiler / setMemFactorLocked." into udc-dev am: 71aad2a2 am: 85f00793 am: 171940ae am: b6266556

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



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