am b2f414fb: am 98e5bf2c: Merge "Support CAST V2 Authentication in MediaDrm" into klp-modular-dev

* commit 'b2f414fbd6e3be45bbea28d84db3ce9712ddcd5b':
  Support CAST V2 Authentication in MediaDrm
Merge "Declare ownership of native_handle_t object"
merge in master-release history after reset to master
am 17b5ca1e: Merge "opengl: fix UAL conformity"

* commit '17b5ca1e665a1bbe17387b36fcce8f6b52513d5e':
  opengl: fix UAL conformity
am fc1544d5: am 17b5ca1e: Merge "opengl: fix UAL conformity"

* commit 'fc1544d52d1232ccdf57a05704a013bad784f8f6':
  opengl: fix UAL conformity
PowerManager: add powerHint binder method

Change-Id: Ide1d50bb1580698b25296fbfc1cc63c3b21a00bc
Misc. buttons aren't gamepad keys.

BUTTON_[1-9] are intended to be misc. buttons so the kernel will
assign them to non-gamepad devices.  As such, we shouldn't treat them
as belonging to gamepads at all.

Bug: 13432364
Change-Id: Ida52ec45dadb53df1a9d36ac3ab212a2d2b56359
Merge "Misc. buttons aren't gamepad keys."
merge in master-release history after reset to master
am 033bdd72: Merge "Remove global variables from ProcessState."

* commit '033bdd72f9f32f4bd3d282750bdc0dcfbb469959':
  Remove global variables from ProcessState.
am d09b2acd: am 033bdd72: Merge "Remove global variables from ProcessState."

* commit 'd09b2acdc8ca706c65984956e61c0bb333cee992':
  Remove global variables from ProcessState.
am d2f76332: Merge "AArch64: Correction to OMX_U32 and OMX_S32"

* commit 'd2f7633277dd13ac269adb51c4e7a85746e6c599':
  AArch64: Correction to OMX_U32 and OMX_S32
am fb3bbd1d: am d2f76332: Merge "AArch64: Correction to OMX_U32 and OMX_S32"

* commit 'fb3bbd1df323c24dc10c095f29ee8010fc3d1df0':
  AArch64: Correction to OMX_U32 and OMX_S32
Update to follow interface change.

Change-Id: I3ef37a32144e79b481af1b12c89531f3757689ef
Add ACONFIGURATION_UI_MODE_TYPE_WATCH to configuation enum.

Bug:13395758
Change-Id: Iecdae299bfd030f86145d02fa7860374b5a40a74
am 27f8840f: Merge "make struct Event layout consistent on 32/64-bit"

* commit '27f8840f228abfe5e2458a261ce5403871495a54':
  make struct Event layout consistent on 32/64-bit
am 3b1cb037: am 27f8840f: Merge "make struct Event layout consistent on 32/64-bit"

* commit '3b1cb037eea56dba0d134c6858f8ddc0f9743ff8':
  make struct Event layout consistent on 32/64-bit
Merge "Add android.software.managedprofiles feature flag."
native gui: 64-bit compile issues

Change-Id: I45f605ff3759fb7ae9f0a6425d557d195f93281e
am ad98ad04: Add ACONFIGURATION_UI_MODE_TYPE_WATCH to configuation enum.

* commit 'ad98ad0493625578f19c727576d02725b82f927c':
  Add ACONFIGURATION_UI_MODE_TYPE_WATCH to configuation enum.