[automerger skipped] Merge "Add current.txt HAL sections for S." am: cc7eac49b2 am: b37f307723 -s ours

am skip reason: Change-Id I67f6c5d583b853516c7203edb77f3c5fa841863b with SHA-1 e6c11c9407 is in history

Change-Id: I53b627b63025996eb7eaca609701e4c503fc190a