am 16c0b295: am bba3a694: Merge "Telephony API extension v2"

* commit '16c0b295ef069e128a4e01fd2f72da06784950a1':
  Telephony API extension v2
Merge "use relative positioning for notification actions" into klp-dev
am 70d5ed26: Merge "use relative positioning for notification actions" into klp-dev

* commit '70d5ed269268c1da6169b49b555d7295ac5d6763':
  use relative positioning for notification actions
am d265bcc4: Merge "Inform libcore of time format pref. changes."

* commit 'd265bcc4b555ab75009f8ceb32cc90007a621b41':
  Inform libcore of time format pref. changes.
am 28ccb4f7: Merge "Don\'t use size_t for variables that store uint32_t value"

* commit '28ccb4f7d9bbea65c8cb1807e332a46ef37bc619':
  Don't use size_t for variables that store uint32_t value
am 5de03b18: Merge "Don\'t assume that size_t is 32-bit"

* commit '5de03b18ea455c0250cbd01912282f28d8635910':
  Don't assume that size_t is 32-bit
DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2
BUG:13191516

Original CLs below:

In nativeDecodeFileDescriptor, use fdopen.

Instead of attempting to mmap the entire file, create an
SkFILEStream from a FILE.

BUG:11669944
BUG:11028218
Cherry-pick from: If67da91484acc79f9f3dde6d05201409c0c75e41

-------------------------------------------------------------------------

Decode file descriptor from the correct offset.

Fix a few bugs in nativeDecodeFileDescriptor:
1. Restore the FD's offset when exiting the function.
2. Copy the data when potentially using an SkImageRef.
   The old behavior would have continued to modify the
   file descriptor's offset each time a new decode was
   required. The copy ensures that the file descriptor
   remains unchanged.
3. Buffer the file stream.
   Prior to this change, if the image was not a PNG,
   the stream would be rewound to the beginning of the
   file, even if the file descriptor was passed in with
   an offset. Thanks to the buffer, the stream is only
   rewound to the original offset.

Depends on https://googleplex-android-review.googlesource.com/#/c/415821/1
in external/skia

BUG:12807677
BUG:12895876
Cherry-pick from: I38b8cf5d210dbbc0107e6562e3884867de57fc4b
Show the keyguard if unsecure window on top. DO NOT MERGE.

When traversing windows save the fact that windows above the topmost
fullscreen window do not hide the lockscreen. If there is such a
window don't show it.

Fixes bug 13225149.

Change-Id: Ib6f33cbcfb2f60d8957a9184729ecdec80c6a236
Merge "EGL14.eglCreateWindowSurface should set producerControlledByApp" into klp-dev
am faddd77a: Merge "EGL14.eglCreateWindowSurface should set producerControlledByApp" into klp-dev

* commit 'faddd77a917dd423aee5fc64c056c8c2e0ce6f9a':
  EGL14.eglCreateWindowSurface should set producerControlledByApp
Merge "More on issue #12031685 (DO NOT MERGE)" into klp-dev
Merge "DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2 BUG:13191516" into klp-dev
am 785d764b: Merge "More on issue #12031685 (DO NOT MERGE)" into klp-dev

* commit '785d764bd56b2d41216aa52ab8f6b6af9179f9c9':
  More on issue #12031685 (DO NOT MERGE)
am bc57651f: Merge "DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2 BUG:13191516" into klp-dev

* commit 'bc57651fb510d7b1a2811235f96e711b6be12a12':
  DO NOT MERGE - merge nativeDecodeFileDescriptor fixes into KLP-MR2 BUG:13191516
Merge "resolved conflicts for merge of 8d3281f5 to klp-dev-plus-aosp" into klp-dev-plus-aosp
Make MtpDatabase use libexif instead of libjhead

b/12203995

Change-Id: I0e0e6209be7a9d3e493abdcee8619cae6d4b9501
am 87e9e744: am 92a32832: DO NOT MERGE - Fix Javadoc build break.

* commit '87e9e744ed7acc554a6b4c7dd90fab376eabb30b':
  DO NOT MERGE - Fix Javadoc build break.
am 1276295b: am a3ea4be5: Prevent SpellChecker from setting invalid range - DO NOT MERGE

* commit '1276295b6b157b583480fbdf2be72b9bc0fb1c54':
  Prevent SpellChecker from setting invalid range - DO NOT MERGE
am 4f36104f: am e29c96e7: Merge "libexif is now libjhead" into klp-dev

* commit '4f36104f06755dc2c95b3d7c8bac5312d7572199':
  libexif is now libjhead
am d2a244f9: am 8cb232cb: Merge "ProgressBar is important for accessibility by default." into klp-dev

* commit 'd2a244f9767ee678d3971c9ad43a07100db4e8c9':
  ProgressBar is important for accessibility by default.