Merge "Merge "Conserve activity flag after notif update" into rvc-dev am: 0d8689233d am: 93cf1840ab" into rvc-d1-dev-plus-aosp