Merge branch 'jb-mr1-dev-plus-aosp' into jb-mr2-dev

-s ours, so that jb-mr1-dev-plus-aosp can continue fastforwarding to
jb-mr2-dev.
Merge branch 'jb-mr2-dev' into jb-mr2-dev-plus-aosp

-s ours so that jb-mr2-dev can continue fastforwarding to
jb-mr2-dev-plus-aosp.
Merge branch 'jb-mr2-dev-plus-aosp'

-s ours so that jb-mr2-dev-plus-aosp can continue fastforwarding to
master.
Reconcile with jb-mr2-release - do not merge

Change-Id: Iec30f1654f196ebae279ebf71648a2cb44fedc4b
am affd710b: (-s ours) Reconcile with jb-mr2-release - do not merge

* commit 'affd710b209cd09c5f2137b59a5699e1e521b83d':
  Camera3: Fix initial orientation configuration.
  Fix reverb at 48kHz
  Fix error message to match CTS
merge in jb-mr2-release history after reset to jb-mr2-dev
wifi-display: retry UDP read/write to improve connection robustness

Bug: 8922753
Change-Id: Ie6d18f03afcb23d11e6f0e63403e8f0d59b70be8
Adjust timestamp scale

BufferQueue item timestamps are in nanoseconds, MediaCodec buffer
timestamps are in microseconds.  Adjust.

Bug 8988357

Change-Id: Ib12824d7eea0316a14543c756e3a127c0866db6b
Reconcile with AOSP
am a7f316e8: Reconcile with AOSP

* commit 'a7f316e84a1be6c8c23ef0c37a3dc07495266ed4':
am 99f27cdf: wifi-display: retry UDP read/write to improve connection robustness

* commit '99f27cdf2c2711aa0c8b4d9ae4d12cae37ff94f6':
  wifi-display: retry UDP read/write to improve connection robustness
am b5b2d03f: am 99f27cdf: wifi-display: retry UDP read/write to improve connection robustness

* commit 'b5b2d03fc2c154a613ba68b599cd474b3e6ccec3':
  wifi-display: retry UDP read/write to improve connection robustness
update to Fence::waitForever() API change

Bug: 8988871
Change-Id: I24a2620d356f3bb6207ed834c79fd3e48b429695
Merge "Adjust timestamp scale" into jb-mr2-dev
am 4224dedf: Merge "Adjust timestamp scale" into jb-mr2-dev

* commit '4224dedff0451e0aea3b8f5c3aaf5f2ad0eac1dd':
  Adjust timestamp scale
am b07d3c48: am 4224dedf: Merge "Adjust timestamp scale" into jb-mr2-dev

* commit 'b07d3c48ea7dcb5bb41c8f5d93b23ac6c42b15dc':
  Adjust timestamp scale
Merge "update to Fence::waitForever() API change" into jb-mr2-dev
am e2dfa5a4: Merge "update to Fence::waitForever() API change" into jb-mr2-dev

* commit 'e2dfa5a4ea3459b155b4b403b7dafe2116d960d4':
  update to Fence::waitForever() API change
am 074eb387: am e2dfa5a4: Merge "update to Fence::waitForever() API change" into jb-mr2-dev

* commit '074eb387091ca464257601a2d23020e3e10a6915':
  update to Fence::waitForever() API change
Reconcile with jb-mr2-release - do not merge

Change-Id: I1d5a94ed7749af26f6eb8e5e06443bd83fc63753