Merge "DO NOT MERGE: Whitelist android.intent.action.DISMISS_TIMER" into oreo-cts-dev