[automerger skipped] Merge "Add a few type for Analog frontend" am: 69459316b8 am: 2d42961f91 am: f211478dfe -s ours
am skip reason: Change-Id Ib0dbd610620682854f8c2b421285da39233cec01 with SHA-1 d13c298ff5 is in history

Change-Id: Ic811ba669e745815d43568435200b00334e48b43