camera2: Harden AutoFocusStateMachine against null values in callbacks

Bug: 11269834
Change-Id: Id3cb85eb3e9aaaf6714fd81a5d53811d4cbfefa9
gcam: Add empty SysTrace class

Bug: 11071158
Change-Id: I31f8c449dc4c47c610b0ef3c24849e0402634c86
Merge "gcam: Add empty SysTrace class" into klp-dev
camera2: Add tracing to AutoFocusStateMachine (lens-locking actions only)

Bug: 11071158
Change-Id: I6a1d0130b6ca36c853f539ef3f1afb363a70df24
camera2: Add #resetState to AutoFocusStateMachine

Bug: 11071158
Change-Id: I24bc2d771703bb502dcbb676b6262954f2017630
camera2: Add updateCaptureRequest method

It can be used to update repeating request with current auto focus mode.

Bug: 10649854
Change-Id: I5e92218c61dea04990581d37f92bf25a1f8dbe91
Merge "camera2: Add updateCaptureRequest method" into klp-dev
camera2: Add #resetState to AutoFocusStateMachine

Bug: 11071158
Change-Id: I24bc2d771703bb502dcbb676b6262954f2017630
camera2: Add updateCaptureRequest method

It can be used to update repeating request with current auto focus mode.

Bug: 10649854
Change-Id: I5e92218c61dea04990581d37f92bf25a1f8dbe91
merge in release branch changes (no-op).
Don't show the alternates dialog for GAL contacts

There's a bug in the chips code that causes this to show either no
alternates, or a different person, which is scaring people.

The proper future fix is to store some more information about GAL
contacts so we can do a proper lookup.

Bug: 11535331

Change-Id: Id8b6fc834446afe33bd6ec4e99b3d2b75b985bde
Merge branch 'android-4.4.1_r1' into HEAD