Merge "Disable scrim focus on AOD" into pi-dev
am: 0487601e57

Change-Id: I1800a1de9842e52188fe6b40ce5da6f9a96b19ea