Merge "Merge "Log correct number of whitelisted packages." into qt-dev am: fefd66a530 am: f10dc043bb" into qt-r1-dev-plus-aosp