Merge "Track shell adbd denial in bug_map" into qt-dev