Recover apps with malformed certificates.

There was a window of time in Lollipop where we persisted certificates
after they had passed through a decode/encode cycle.  The well-written
OpenSSL library was liberal when decoding (allowing slightly malformed
certs to be parsed), but then strict when encoding, giving us
different bytes for effectively the same certificate.

A related libcore change (0c990ab4a90b8a5492a67b2b728ac9a4a1ccfa1b)
now returns the original bytes verbatim, fixing both pre-Lollipop
installs and installs after that change.

This change recovers any apps that had been installed during the
window of time described above by doing a one-time check to see if
the certs are effectively equal.

Bug: 18228011
Change-Id: Ib82bd6db718d0490d7a26c9c1014b7c8457a7f2d
Camera: Add support for QC camera features.

Added APIs and keys for all QC features. This
will enable application to get/set paramters.
(cherrypicked from commit d0c5a0ee7e9af41320fed00ff324c6d0f22eb697)

Change-Id: I68c23aaf7267645efeb4d4743b390a048292b7fd
Telephony: Set the value of min match according to one property

CTA requires to match 11 phone numbers, so use the value of the property
"persist.env.c.phone.matchnum" to set it 11 in case of CTA tests, but by
default it is 7 without change.

Change-Id: I8cd4105c06c71af1ad242858d8de474459d96ee1
Telephony: Check the length of phone numbers before use

If the phone number string is null or empty, just return
to avoid null exception.

CRs-Fixed: 399293

Change-Id: I78db37d70e38cd2782c13621f98dc25d8624bfb7
Merge branch 'temp' of https://github.com/Axxion-Team/frameworks_base into aosp

Conflicts:
	core/java/android/hardware/Camera.java
	core/jni/android_hardware_Camera.cpp
	media/java/android/media/CamcorderProfile.java
Revert "Reintroduce button-backlight (and respective inactivity timeout)"

This reverts commit a47847b9b1a0fd17b67f1b797076c9674e891340.

Conflicts:
	services/core/java/com/android/server/power/PowerManagerService.java