DO NOT MERGE - Wraps custom save subtitle on ScrollView.

(cherrypick from Ided12e8dbce2c3d80c7db8f167109ed9108c904b)

Test: CtsAutoFillServiceTestCases pass
Test: manual verification

Change-Id: Ida44970d68755423cb080f4c562ddcdec90efa6f
Fixes: 62534917
7 files changed