am ec8917dc: Merge "Increase orientation settle time. Bug: 4981385"

* commit 'ec8917dccb5a3923458c435f6356b9c1a7975370':
  Increase orientation settle time. Bug: 4981385