Merge "DO NOT MERGE Examine sort field for sensitive fields am: ecf038d6ff am: 10e24fef12" into qt-r1-dev-plus-aosp