Merge "DO NOT MERGE Remove Privacy Indicators am: 9a560e068d" into qt-dev-plus-aosp