Merge "camera2: Api change (#getFrameNumber -> long; @hide REQUEST_FRAME_COUNT)" into lmp-dev