Merge "Scroll to bottom of screen when adding preferences via code" into oreo-cts-dev
am: ac234a78a3

Change-Id: Ice3cba73e27c120ff1f7ef7d3ecfb0780ef81d12