Merge "Mark isHidlGralloc as 'const'" am: 9ff0990501 am: 560981a63c
am: 4ce787b171

Change-Id: If3a24c5a16ad131057763aa54d656e8fa926b420