Merge "QCamera2/HAL3: Set timestamps in private display metadata" into nyc-mr1-dev
am: 11475581e2

Change-Id: I8ef68d9f743bd52cbf7e8654bf38555458f6d8ec