Merge "SYSTEM/app/Camera2/Camera2 app - update the version to target P (28) or higher." am: ea0c1d2ce5
am: 98e4cfeaf2

Change-Id: Ieb8ffeed7b6c8d2e702d4b7b5f6cae581ae5c5b7