[automerger] Merge "Fixed an issue where the contentHeight was wrong" into pi-dev...

author Android Build Merger (Role) <noreply-android-build-merger@google.com>

Mon, 18 Jun 2018 17:46:19 +0000 (17:46 +0000)

committer Android Build Merger (Role) <noreply-android-build-merger@google.com>

Mon, 18 Jun 2018 17:46:19 +0000 (17:46 +0000)
author Android Build Merger (Role) <noreply-android-build-merger@google.com>
Mon, 18 Jun 2018 17:46:19 +0000 (17:46 +0000)
committer Android Build Merger (Role) <noreply-android-build-merger@google.com>
Mon, 18 Jun 2018 17:46:19 +0000 (17:46 +0000)
diff --cc packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java
Simple merge
author	Android Build Merger (Role) <noreply-android-build-merger@google.com>
	Mon, 18 Jun 2018 17:46:19 +0000 (17:46 +0000)
committer	Android Build Merger (Role) <noreply-android-build-merger@google.com>
	Mon, 18 Jun 2018 17:46:19 +0000 (17:46 +0000)