Merge "Improved NumberBlockingTest so it's more lenient to changes on 'dumpsys user'" am: 9bb339e2cd am: 01d392979a am: c3ae8caf5f

Change-Id: Iaa29af9f943a16b29fcb9b3ba6e3045324c99546