Merge commit '5a67749a35bcbb70bfcc5f4c18da6a196bda33c1' * commit '5a67749a35bcbb70bfcc5f4c18da6a196bda33c1': Fix Vibrator permission CTS test broken earlier.
Merge commit '5a67749a35bcbb70bfcc5f4c18da6a196bda33c1' * commit '5a67749a35bcbb70bfcc5f4c18da6a196bda33c1': Fix Vibrator permission CTS test broken earlier.