Merge tag 'AU_LINUX_ANDROID_LA.BF64.1.2.1.05.00.02.066.045' into HEAD

AU_LINUX_ANDROID_LA.BF64.1.2.1.05.00.02.066.045 based on quic/aosp/LA.BF64.1.2.1

* tag 'AU_LINUX_ANDROID_LA.BF64.1.2.1.05.00.02.066.045':
  audiopolicy: Do not route VoIP call to HDMI
  Camera: Revert max camera to 2 from 4
  soundpool: reuse channel for same sample if available
  mpeg2ts: Add support for parsing HEVC stream in MPEG2 TS container
  frameworks/av: Fix include dir for audio defs
  libstagefright: Add check for bits avail to read
  Revert "camera: Remove cameraservice dependencies from CameraHardwareInterface"
  libmediaplayerService: Handle error on Player start

Conflicts:
	media/libstagefright/include/ExtendedUtils.h

Change-Id: Icc47ab2552c1daea16668be90a25903e684a1c33