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

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



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