Android 8.0.0 release 21
Change namespace for internal only intent. am: fbfa3ff5a6  -s ours
am: 955f16f577  -s ours

Change-Id: I383f3db1ae5b72e2422d9a23a39d6a297d100097