Merge changes from topic "new_data_flag" am: 7c57209294 am: e775dcbcc4
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2089545 Change-Id: Ifbdf40d2f7eb089a87e5276ede2315070b8c0874 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: