[automerger skipped] DO NOT MERGE - Added system user packages blacklist / whitelist to dump() am: 7082688f29 am: ad730d7573 -s ours
am skip reason: subject contains skip directive

Change-Id: Ibb249d7808dfc4312fc6e1e8d4b157d6bfab23d9