Merge changes from topic "new_data_flag" am: 7c572092 am: e775dcbc am:...

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

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



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