Merge changes from topic "new_data_flag" am: 7c572092 am: e775dcbc am: dad3337c am: 518ffcbe am: 1b70467a

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



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