am 182bb54f: am 2de9b9d2: am ea2805de: Merge "Change FRAMEDROP_TOLERANCE value when upper 15MP camera size." into lollipop-cts-dev

* commit '182bb54f8b158dc9281c92b0f7c7d53f3d0cd4a9':