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

Change-Id: Id2e5ebda1f874e82b53e52a5989cbcc772305f29