Merge "Add carrier config to skip validation if recently validate." am: beb963fbc2 am: ebf5f1d4f3

Change-Id: Ia77f66ae22b6657fa0c5d09b678cf1a810c3c00a