Merge "Merge "Fix advanced icon will incorrect on some device" into rvc-dev am: 40bdc176e1 am: 8494fdb10a am: 1526bd291b" into rvc-qpr-dev-plus-aosp